From 749182393c49818b03172986aa2ba6afe3615c5d Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 13 Jul 2009 11:31:34 +0100 Subject: [PATCH] x86: move ucode_cpu_info into per-CPU space Signed-off-by: Jan Beulich --- xen/arch/x86/microcode.c | 8 ++++---- xen/arch/x86/microcode_amd.c | 6 +++--- xen/arch/x86/microcode_intel.c | 8 ++++---- xen/include/asm-x86/microcode.h | 4 +++- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/microcode.c b/xen/arch/x86/microcode.c index ebad6ef11d..0e97f36e89 100644 --- a/xen/arch/x86/microcode.c +++ b/xen/arch/x86/microcode.c @@ -40,7 +40,7 @@ const struct microcode_ops *microcode_ops; static DEFINE_SPINLOCK(microcode_mutex); -struct ucode_cpu_info ucode_cpu_info[NR_CPUS]; +DEFINE_PER_CPU(struct ucode_cpu_info, ucode_cpu_info); struct microcode_info { unsigned int cpu; @@ -51,7 +51,7 @@ struct microcode_info { static void __microcode_fini_cpu(int cpu) { - struct ucode_cpu_info *uci = ucode_cpu_info + cpu; + struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); xfree(uci->mc.mc_valid); memset(uci, 0, sizeof(*uci)); @@ -67,7 +67,7 @@ static void microcode_fini_cpu(int cpu) int microcode_resume_cpu(int cpu) { int err = 0; - struct ucode_cpu_info *uci = ucode_cpu_info + cpu; + struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); struct cpu_signature nsig; gdprintk(XENLOG_INFO, "microcode: CPU%d resumed\n", cpu); @@ -101,7 +101,7 @@ static int microcode_update_cpu(const void *buf, size_t size) { int err; unsigned int cpu = smp_processor_id(); - struct ucode_cpu_info *uci = ucode_cpu_info + cpu; + struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); spin_lock(µcode_mutex); diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index 77053c258d..3031f436d7 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -68,7 +68,7 @@ static int collect_cpu_info(int cpu, struct cpu_signature *csig) static int microcode_fits(void *mc, int cpu) { - struct ucode_cpu_info *uci = ucode_cpu_info + cpu; + struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); struct microcode_header_amd *mc_header = mc; unsigned int current_cpu_id; unsigned int equiv_cpu_id = 0x0; @@ -125,7 +125,7 @@ out: static int apply_microcode(int cpu) { unsigned long flags; - struct ucode_cpu_info *uci = ucode_cpu_info + cpu; + struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); uint32_t rev, dummy; struct microcode_amd *mc_amd = uci->mc.mc_amd; @@ -253,7 +253,7 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t size) unsigned long offset = 0; int error = 0; int ret; - struct ucode_cpu_info *uci = ucode_cpu_info + cpu; + struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); void *mc; /* We should bind the task to the CPU */ diff --git a/xen/arch/x86/microcode_intel.c b/xen/arch/x86/microcode_intel.c index 7d8657ff2f..ac085a02a2 100644 --- a/xen/arch/x86/microcode_intel.c +++ b/xen/arch/x86/microcode_intel.c @@ -99,7 +99,7 @@ static int collect_cpu_info(int cpu_num, struct cpu_signature *csig) static inline int microcode_update_match( int cpu_num, struct microcode_header_intel *mc_header, int sig, int pf) { - struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num; + struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu_num); return (sigmatch(sig, uci->cpu_sig.sig, pf, uci->cpu_sig.pf) && (mc_header->rev > uci->cpu_sig.rev)); @@ -201,7 +201,7 @@ static int microcode_sanity_check(void *mc) */ static int get_matching_microcode(void *mc, int cpu) { - struct ucode_cpu_info *uci = ucode_cpu_info + cpu; + struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); struct microcode_header_intel *mc_header = mc; struct extended_sigtable *ext_header; unsigned long total_size = get_totalsize(mc_header); @@ -251,7 +251,7 @@ static int apply_microcode(int cpu) unsigned long flags; unsigned int val[2]; int cpu_num = raw_smp_processor_id(); - struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num; + struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu_num); /* We should bind the task to the CPU */ BUG_ON(cpu_num != cpu); @@ -362,7 +362,7 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t size) static int microcode_resume_match(int cpu, struct cpu_signature *nsig) { - struct ucode_cpu_info *uci = ucode_cpu_info + cpu; + struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); return (sigmatch(nsig->sig, uci->cpu_sig.sig, nsig->pf, uci->cpu_sig.pf) && (uci->cpu_sig.rev > nsig->rev)); diff --git a/xen/include/asm-x86/microcode.h b/xen/include/asm-x86/microcode.h index 980da227dc..f4a9481473 100644 --- a/xen/include/asm-x86/microcode.h +++ b/xen/include/asm-x86/microcode.h @@ -1,6 +1,8 @@ #ifndef ASM_X86__MICROCODE_H #define ASM_X86__MICROCODE_H +#include + struct cpu_signature; struct ucode_cpu_info; @@ -88,7 +90,7 @@ struct ucode_cpu_info { } mc; }; -extern struct ucode_cpu_info ucode_cpu_info[]; +DECLARE_PER_CPU(struct ucode_cpu_info, ucode_cpu_info); extern const struct microcode_ops *microcode_ops; #endif /* ASM_X86__MICROCODE_H */ -- 2.30.2